projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1e1ea22
)
* src/ftfont.c (ftfont_shape_by_flt): Parenthesize as per GNU style.
author
Paul Eggert
<eggert@cs.ucla.edu>
Fri, 25 Mar 2016 17:58:52 +0000
(10:58 -0700)
committer
Paul Eggert
<eggert@cs.ucla.edu>
Fri, 25 Mar 2016 18:00:23 +0000
(11:00 -0700)
src/ftfont.c
patch
|
blob
|
history
diff --git
a/src/ftfont.c
b/src/ftfont.c
index b0b532015c2945c7ba0fc37f2a8dfa2de0e299e4..7285aee9bd4129a4a84f4f8643ec89b633674768 100644
(file)
--- a/
src/ftfont.c
+++ b/
src/ftfont.c
@@
-2600,8
+2600,8
@@
ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font,
"combining" is the sole FLT provided by the m17n-lib. In
addition, it is the sole FLT that can handle the other
combining characters with non-OTF fonts. */
- if (
0x300 <= c1 && c1 <= 0x36F
- || (! otf
&& CHAR_HAS_CATEGORY (c1, '^')))
+ if (
(0x300 <= c1 && c1 <= 0x36F)
+ || (! otf && CHAR_HAS_CATEGORY (c1, '^')))
flt = mflt_get (msymbol ("combining"));
}
if (! flt && ! otf)